projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5e5f7c 86d0613)
Fix merge conflicts
authorjustbur <justin@burkett.cc>
Thu, 24 Sep 2015 14:38:06 +0000 (10:38 -0400)
committerjustbur <justin@burkett.cc>
Thu, 24 Sep 2015 14:38:06 +0000 (10:38 -0400)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.